bitkeeper revision 1.1159.1.546 (4208f897krIXzlEsP6G6V3H5URXQSg)

fix typo
Signed-off-by: steven.hand@cl.cam.ac.uk

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 46839b66ec02ecbd8536d8097c21338f682c88c7..5a2638c8f825311fe75030199fa56408e2f35ffe 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -99,3 +99,35 @@ xen/tools/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
+tools/cmdline/xen/arch-x86_32.h
+tools/cmdline/xen/arch-x86_64.h
+tools/cmdline/xen/dom0_ops.h
+tools/cmdline/xen/event_channel.h
+tools/cmdline/xen/grant_table.h
+tools/cmdline/xen/io/blkif.h
+tools/cmdline/xen/io/domain_controller.h
+tools/cmdline/xen/io/ioreq.h
+tools/cmdline/xen/io/netif.h
+tools/cmdline/xen/io/ring.h
+tools/cmdline/xen/linux/privcmd.h
+tools/cmdline/xen/linux/suspend.h
+tools/cmdline/xen/physdev.h
+tools/cmdline/xen/sched_ctl.h
+tools/cmdline/xen/trace.h
+tools/cmdline/xen/xen.h
+tools/cmdline/xen/arch-x86_32.h
+tools/cmdline/xen/arch-x86_64.h
+tools/cmdline/xen/dom0_ops.h
+tools/cmdline/xen/event_channel.h
+tools/cmdline/xen/grant_table.h
+tools/cmdline/xen/io/blkif.h
+tools/cmdline/xen/io/domain_controller.h
+tools/cmdline/xen/io/ioreq.h
+tools/cmdline/xen/io/netif.h
+tools/cmdline/xen/io/ring.h
+tools/cmdline/xen/linux/privcmd.h
+tools/cmdline/xen/linux/suspend.h
+tools/cmdline/xen/physdev.h
+tools/cmdline/xen/sched_ctl.h
+tools/cmdline/xen/trace.h
+tools/cmdline/xen/xen.h

diff --git a/linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h
index f6fcff4e08a64221439f66014e1cbc2f8e42e40c..09a1bb7d83384e25d21419bb0f1adcd24d913a57 100644 (file)
--- a/linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h
@@ -438,7 +438,7 @@ HYPERVISOR_multicall(
 
 static inline int
 HYPERVISOR_update_va_mapping(
-    unsigned long nr, pte_t new_val, unsigned long flags)
+    unsigned long va, pte_t new_val, unsigned long flags)
 {
     int ret;
     unsigned long ign1, ign2, ign3;